ready for upload - Class version 17
